a5a7da52becd1ec2dd044e3a10d9e08ef207787a,VaadinatorTooling/VaadinatorGenerator/src/main/java/de/akquinet/engineering/vaadinator/generator/DefaultCodeGenerator.java,DefaultCodeGenerator,generateCode,#VaadinatorConfig#,36

Before Change


				|| vaadinatorConfig.getGenTypeEn() == VaadinatorConfig.GenType.ALL) {
			// jetzt common generieren
			if (vaadinatorConfig.isHasDisplayBeans()) {
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.presenter",
						null, null, null, null, "Presenter.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.presenter", "Presenter", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.presenter",
						null, null, null, null, "SubviewCapablePresenter.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.presenter", "SubviewCapablePresenter", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "View.template", packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "View", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "ObservableView.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "ObservableView", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "ValidatableView.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "ValidatableView", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "ErrorHandlerView.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "ErrorHandlerView", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "ExceptionMappingStrategy.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "ExceptionMappingStrategy", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "DefaultExceptionMappingStrategy.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "DefaultExceptionMappingStrategy",
								".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "FieldInitializer.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "FieldInitializer",
								".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg() + ".ui.view", null,
						null, null, null, "VaadinView.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								vaadinatorConfig.getBasePckg() + ".ui.view", "VaadinView",
								".java"),
						TEMPLATE_PACKAGE, log);
			}

After Change


	private static final String TEMPLATE_PACKAGE = "/de/akquinet/engineering/vaadinator/templates/";

	@Override
	public void generateCode(VaadinatorConfig vaadinatorConfig) throws IOException {
		File targetFolderWebStart = existingFolder(vaadinatorConfig.getTargetFolderBaseStart(), "webapp");
		Log log = vaadinatorConfig.getLog();
		if (vaadinatorConfig.getGenTypeEn() == VaadinatorConfig.GenType.RESOURCES
				|| vaadinatorConfig.getGenTypeEn() == VaadinatorConfig.GenType.ALL) {
			// bei Resources bisher nur common
			File targetFolderWebInf = existingFolder(targetFolderWebStart, "WEB-INF");
			File targetFolderVaadin = existingFolder(targetFolderWebStart, "VAADIN");
			File targetFolderThemes = existingFolder(targetFolderVaadin, "themes");
			File targetFolderTouchkitex = existingFolder(targetFolderThemes, "touchkitex");

			if (vaadinatorConfig.isHasDisplayBeans() && vaadinatorConfig.isGenServletBase()) {
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg(), null, null, null,
						null, "stylescss.template", (new File(targetFolderTouchkitex, "styles.css")), false,
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg(), null, null, null,
						null, "touchkitexcss.template", (new File(targetFolderTouchkitex, "touchkitex.css")), false,
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg(), null, null, null,
						null, "beansxml.template", (new File(targetFolderWebInf, "beans.xml")), false,
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg(), null, null, null,
						null, "webxml.template", (new File(targetFolderWebInf, "web.xml")), false, TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), vaadinatorConfig.getBasePckg(), null, null, null,
						null, "widgetset.template",
						packageToFile(vaadinatorConfig.getTargetFolderResStart(), vaadinatorConfig.getBasePckg(),
								vaadinatorConfig.getProjectName() + "Widgetset", ".gwt.xml"),
						false, TEMPLATE_PACKAGE, log);
			}
			if (vaadinatorConfig.isHasDisplayBeans()) {
				// Internationalization
				// EINE pro Profile
				for (String displayProfileName : vaadinatorConfig.getDisplayProfileNames()) {
					runVelocity(null, vaadinatorConfig.getCommonMap(),
							vaadinatorConfig.getBasePckg() + ".ui." + displayProfileName + ".view", null,
							vaadinatorConfig.getBasePckg() + ".ui." + displayProfileName + ".presenter",
							vaadinatorConfig.getBasePckg() + ".ui." + displayProfileName + ".view", displayProfileName,
							"messages.template",
							packageToFile(vaadinatorConfig.getTargetFolderResStart(),
									vaadinatorConfig.getBasePckg() + ".ui." + displayProfileName + ".view", "messages",
									".properties"),
							TEMPLATE_PACKAGE, log);
				}
			}
		}
		if (vaadinatorConfig.getGenTypeEn() == VaadinatorConfig.GenType.SOURCES
				|| vaadinatorConfig.getGenTypeEn() == VaadinatorConfig.GenType.ALL) {
			// jetzt common generieren
			if (vaadinatorConfig.isHasDisplayBeans()) {
				String presenterPckg = vaadinatorConfig.getBasePckg() + ".ui.presenter";
				String viewPckg = vaadinatorConfig.getBasePckg() + ".ui.view";

				runVelocity(null, vaadinatorConfig.getCommonMap(), presenterPckg,
						null, null, null, null, "Presenter.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								presenterPckg, "Presenter", ".java"),
						TEMPLATE_PACKAGE, log);
				createCommonArtifact(vaadinatorConfig, presenterPckg + ".listener",
						"ActionListener");
				createCommonArtifact(vaadinatorConfig, presenterPckg, "PresenterImpl");

				createPresenterListeners(vaadinatorConfig);
				runVelocity(null, vaadinatorConfig.getCommonMap(), presenterPckg,
						null, null, null, null, "SubviewCapablePresenter.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								presenterPckg, "SubviewCapablePresenter", ".java"),
						TEMPLATE_PACKAGE, log);

				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "View.template", packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								viewPckg, "View", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "ObservableView.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								viewPckg, "ObservableView", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "ValidatableView.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								viewPckg, "ValidatableView", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "ErrorHandlerView.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								viewPckg, "ErrorHandlerView", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "ExceptionMappingStrategy.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								viewPckg, "ExceptionMappingStrategy", ".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "DefaultExceptionMappingStrategy.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								viewPckg, "DefaultExceptionMappingStrategy",
								".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "FieldInitializer.template",
						packageToFile(vaadinatorConfig.getTargetFolderSrcStart(),
								viewPckg, "FieldInitializer",
								".java"),
						TEMPLATE_PACKAGE, log);
				runVelocity(null, vaadinatorConfig.getCommonMap(), viewPckg, null,
						null, null, null, "VaadinView.template",